Use a single compilation symbol

We use a compilation symbol in our build to allow the inclusion of
specific headers while building GTK, to avoid the need to include only
the global header.

Each namespace has its own compilation symbol because we used to have
different libraries, and strict symbol visibility between libraries;
now that we have a single library, and we can use private symbols across
namespaces while building GTK, we should have a single compilation
symbol, and simplify the build rules.

diff --git a/gdk/broadway/gdkbroadwaycursor.h b/gdk/broadway/gdkbroadwaycursor.h
index 6b5fcc8626282eb397b4c9921f05f10094dbaaf5..2ca1a76134cdb0d01e7be80102471e201aaf4621 100644 (file)
--- a/gdk/broadway/gdkbroadwaycursor.h
+++ b/gdk/broadway/gdkbroadwaycursor.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_BROADWAY_CURSOR_H__
 #define __GDK_BROADWAY_CURSOR_H__
 
-#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 #define GDK_IS_BROADWAY_CURSOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_CURSOR))
 #define GDK_BROADWAY_CURSOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_CURSOR, GdkBroadwayCursorClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkBroadwayCursor GdkBroadwayCursor;
 #else
 typedef GdkCursor GdkBroadwayCursor;

diff --git a/gdk/broadway/gdkbroadwaydisplay.h b/gdk/broadway/gdkbroadwaydisplay.h
index e1e0ffb10d5f4e9cbc5026cffb90258dade7f5aa..b7293dc9325b9964b413347afc835f8997ceab80 100644 (file)
--- a/gdk/broadway/gdkbroadwaydisplay.h
+++ b/gdk/broadway/gdkbroadwaydisplay.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_BROADWAY_DISPLAY_H__
 #define __GDK_BROADWAY_DISPLAY_H__
 
-#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 
@@ -26,7 +26,7 @@
 
 G_BEGIN_DECLS
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkBroadwayDisplay GdkBroadwayDisplay;
 #else
 typedef GdkDisplay GdkBroadwayDisplay;

diff --git a/gdk/broadway/gdkbroadwaydisplaymanager.h b/gdk/broadway/gdkbroadwaydisplaymanager.h
index 355869d9dfb9d6a14ee66e1e87bd219ad85f1233..ac453291dfee0cd09b7e814a6a9a24322b2e39bc 100644 (file)
--- a/gdk/broadway/gdkbroadwaydisplaymanager.h
+++ b/gdk/broadway/gdkbroadwaydisplaymanager.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_BROADWAY_DISPLAY_MANAGER_H__
 #define __GDK_BROADWAY_DISPLAY_MANAGER_H__
 
-#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define GDK_TYPE_BROADWAY_DISPLAY_MANAGER    (gdk_broadway_display_manager_get_type ())
 #define GDK_BROADWAY_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_BROADWAY_DISPLAY_MANAGER, GdkBroadwayDisplayManager))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkBroadwayDisplayManager GdkBroadwayDisplayManager;
 #else
 typedef GdkDisplayManager _GdkBroadwayDisplayManager;

diff --git a/gdk/broadway/gdkbroadwaymonitor.h b/gdk/broadway/gdkbroadwaymonitor.h
index 36714ff55ae127408450ca0a8bb5746d6f029cd1..30bc96844b427feb27e82e311c3f40fb09b41fbd 100644 (file)
--- a/gdk/broadway/gdkbroadwaymonitor.h
+++ b/gdk/broadway/gdkbroadwaymonitor.h
@@ -22,7 +22,7 @@
 #ifndef __GDK_BROADWAY_MONITOR_H__
 #define __GDK_BROADWAY_MONITOR_H__
 
-#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 

diff --git a/gdk/broadway/gdkbroadwaysurface.h b/gdk/broadway/gdkbroadwaysurface.h
index f9e137b181c3e6653746594d96a6388fb6eb34e7..d05bf2627f448472718531d565e3bd97eb3899e2 100644 (file)
--- a/gdk/broadway/gdkbroadwaysurface.h
+++ b/gdk/broadway/gdkbroadwaysurface.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #define GDK_IS_BROADWAY_SURFACE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_SURFACE))
 #define GDK_BROADWAY_SURFACE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_SURFACE, GdkBroadwaySurfaceClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkBroadwaySurface GdkBroadwaySurface;
 #else
 typedef GdkSurface GdkBroadwaySurface;

diff --git a/gdk/broadway/gdkdnd-broadway.c b/gdk/broadway/gdkdnd-broadway.c
index 67438adcfc7ba9a7543a67486e1249837648d9d8..a001cc31ae1b080eb774b949180bdc05a3f059e1 100644 (file)
--- a/gdk/broadway/gdkdnd-broadway.c
+++ b/gdk/broadway/gdkdnd-broadway.c
@@ -41,7 +41,7 @@
 #define GDK_IS_BROADWAY_DRAG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_DRAG))
 #define GDK_BROADWAY_DRAG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_DRAG, GdkBroadwayDragClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkBroadwayDrag GdkBroadwayDrag;
 #else
 typedef GdkDrag GdkBroadwayDrag;

diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build
index bbb8d12c882e903b8ffdd217c036f17e18f871a1..c9aa9314f039055ee9a52125ff2761a8a223f506 100644 (file)
--- a/gdk/broadway/meson.build
+++ b/gdk/broadway/meson.build
@@ -57,7 +57,7 @@ libgdk_broadway = static_library('gdk-broadway',
   gdk_broadway_sources, gdkconfig, gdkenum_h,
   include_directories: [confinc, gdkinc],
   c_args: [
-    '-DGDK_COMPILATION',
+    '-DGTK_COMPILATION',
     '-DG_LOG_DOMAIN="Gdk"',
   ] + common_cflags,
   link_args: common_ldflags,
@@ -71,6 +71,6 @@ executable('gtk4-broadwayd',
   clienthtml_h, broadwayjs_h,
   'broadwayd.c', 'broadway-server.c', 'broadway-output.c',
   include_directories: [confinc, gdkinc, include_directories('.')],
-  c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ],
+  c_args: ['-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ],
   dependencies : [broadwayd_syslib, gdk_deps],
   install : true)

diff --git a/gdk/gdk-autocleanup.h b/gdk/gdk-autocleanup.h
index dd299ddb4dd62c398bbd2817394102e4edeb1899..513725620a5d9bcbf37b08b2cd201db9de18cced 100644 (file)
--- a/gdk/gdk-autocleanup.h
+++ b/gdk/gdk-autocleanup.h
@@ -15,7 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index a99ebefbb63123277f525240f67f0dd2202e54bb..6109480ed075d7cf370ece69db904fa9a3329ce2 100644 (file)
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -21,7 +21,7 @@
 #ifndef __GDK_APP_LAUNCH_CONTEXT_H__
 #define __GDK_APP_LAUNCH_CONTEXT_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h
index 4cc7bf0ca739f8104a1a146791df1daa18c18799..c4e2d3836c4bcf823a7f02b543af1e3261450af8 100644 (file)
--- a/gdk/gdkcairo.h
+++ b/gdk/gdkcairo.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_CAIRO_H__
 #define __GDK_CAIRO_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkcairocontext.h b/gdk/gdkcairocontext.h
index 8d83da759426415e4d7c4064de8b1ca0323fca53..d5e3967cfc74de6a162dc902526bb86e85ef1489 100644 (file)
--- a/gdk/gdkcairocontext.h
+++ b/gdk/gdkcairocontext.h
@@ -21,7 +21,7 @@
 #ifndef __GDK_CAIRO_CONTEXT__
 #define __GDK_CAIRO_CONTEXT__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkclipboard.h b/gdk/gdkclipboard.h
index 5961378d8d2a29025116c1830f410389b0952565..f3b6bba1cc41bc47d012b3ec50fb999f0b69b074 100644 (file)
--- a/gdk/gdkclipboard.h
+++ b/gdk/gdkclipboard.h
@@ -19,7 +19,7 @@
 #ifndef __GDK_CLIPBOARD_H__
 #define __GDK_CLIPBOARD_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkconfig.h.meson b/gdk/gdkconfig.h.meson
index 115c612d82efc0c45fe33b793db03b1c8d62b587..e65e3c9408c3fc4f1adbb7fe23b07b1a155b9622 100644 (file)
--- a/gdk/gdkconfig.h.meson
+++ b/gdk/gdkconfig.h.meson
@@ -1,7 +1,7 @@
 #ifndef __GDKCONFIG_H__
 #define __GDKCONFIG_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkconfig.h.win32 b/gdk/gdkconfig.h.win32
index c941eb86a004e77f80bdd38e75d3f32c531b00ec..fb141ad3ba342630255f403dfb8325d8e79bb7a9 100644 (file)
--- a/gdk/gdkconfig.h.win32
+++ b/gdk/gdkconfig.h.win32
@@ -6,7 +6,7 @@
 #ifndef __GDKCONFIG_H__
 #define __GDKCONFIG_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkconfig.h.win32_vulkan b/gdk/gdkconfig.h.win32_vulkan
index 63f83a99469ea02112168afd631bf12cf2502c2d..1205ceea94429cefcfe72a81499af074ec2af1b4 100644 (file)
--- a/gdk/gdkconfig.h.win32_vulkan
+++ b/gdk/gdkconfig.h.win32_vulkan
@@ -6,7 +6,7 @@
 #ifndef __GDKCONFIG_H__
 #define __GDKCONFIG_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkcontentdeserializer.h b/gdk/gdkcontentdeserializer.h
index f98ec61cd0c2dd9f13d1808f214d2b1c44cd7f29..2b3fda4d8125b5986ee3393af70acc53018f0aca 100644 (file)
--- a/gdk/gdkcontentdeserializer.h
+++ b/gdk/gdkcontentdeserializer.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_CONTENT_DESERIALIZER_H__
 #define __GTK_CONTENT_DESERIALIZER_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkcontentformats.h b/gdk/gdkcontentformats.h
index a530325f02470bd1732961e65cbdb7a27eddee6b..2fe983ea199fe977964b6323bb0ae488c2173381 100644 (file)
--- a/gdk/gdkcontentformats.h
+++ b/gdk/gdkcontentformats.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_CONTENT_FORMATS_H__
 #define __GTK_CONTENT_FORMATS_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkcontentprovider.h b/gdk/gdkcontentprovider.h
index 1bdd6fe4289c0f43f22cb94fc9f2ea4e8de61122..f63be7676c8da466e275bea7f210479482f866e4 100644 (file)
--- a/gdk/gdkcontentprovider.h
+++ b/gdk/gdkcontentprovider.h
@@ -19,7 +19,7 @@
 #ifndef __GDK_CONTENT_PROVIDER_H__
 #define __GDK_CONTENT_PROVIDER_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkcontentproviderimpl.h b/gdk/gdkcontentproviderimpl.h
index 8bf05874d1ef038fb3461d52e6280b05d5e012fc..1c41360243341c5debe5332776b9c553cc444622 100644 (file)
--- a/gdk/gdkcontentproviderimpl.h
+++ b/gdk/gdkcontentproviderimpl.h
@@ -19,7 +19,7 @@
 #ifndef __GDK_CONTENT_PROVIDER_IMPL_H__
 #define __GDK_CONTENT_PROVIDER_IMPL_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkcontentserializer.h b/gdk/gdkcontentserializer.h
index 15cb467363d9c96d7453e4e62c4d90abd7a1afc4..82b4f909a7e2c348c686d397e27dcd9e3a00b408 100644 (file)
--- a/gdk/gdkcontentserializer.h
+++ b/gdk/gdkcontentserializer.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_CONTENT_SERIALIZER_H__
 #define __GTK_CONTENT_SERIALIZER_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index c1ef58437b5f93baea54ffa9c4f97150e2b3e36d..d08baa511a2d93a0d7bf296eb0d09c000ff10d29 100644 (file)
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_CURSOR_H__
 #define __GDK_CURSOR_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index 27242a8c296ff38f4b468ef9ea2f373b2ffc3e4a..0179ee04dc0066ee238e8e386bf4840a182f257e 100644 (file)
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_DEVICE_H__
 #define __GDK_DEVICE_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkdevicepad.h b/gdk/gdkdevicepad.h
index 9d00bc7699b66bda6eb9c8673edfa61f086a910b..475e51a45aa52f6ceb3f9c3331e0045930fd6e97 100644 (file)
--- a/gdk/gdkdevicepad.h
+++ b/gdk/gdkdevicepad.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_DEVICE_PAD_H__
 #define __GDK_DEVICE_PAD_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkdevicetool.h b/gdk/gdkdevicetool.h
index 66bab7e69949c62bb768d9e29be3f1ecbd802eb2..c48ff628e47347c6144977d7ef186668de7227fe 100644 (file)
--- a/gdk/gdkdevicetool.h
+++ b/gdk/gdkdevicetool.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_DEVICE_TOOL_H__
 #define __GDK_DEVICE_TOOL_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index aa17eab9bba25e68c23b26401b04b3fffcc139cd..fed7d86da20c15e22b12e3db9881c68c4e71a9e4 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -22,7 +22,7 @@
 #ifndef __GDK_DISPLAY_H__
 #define __GDK_DISPLAY_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkdisplaymanager.h b/gdk/gdkdisplaymanager.h
index 39514260fd0c851511e775ae6c3e6d729f20f8c3..5e66d4145d9d9010ff3d230e63cdd412e29e1772 100644 (file)
--- a/gdk/gdkdisplaymanager.h
+++ b/gdk/gdkdisplaymanager.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_DISPLAY_MANAGER_H__
 #define __GDK_DISPLAY_MANAGER_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkdrag.h b/gdk/gdkdrag.h
index 984fc8099571c8038be5917e948bf56ff82fa819..80301eb293e5aa3132dcf4700819ae320b49315b 100644 (file)
--- a/gdk/gdkdrag.h
+++ b/gdk/gdkdrag.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_DND_H__
 #define __GDK_DND_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkdrawcontext.h b/gdk/gdkdrawcontext.h
index 6a851d1951669d55c0fb1dd0651f022ac151c0da..e818ddd62d95b5c7e082f83596938c47aa21fb9f 100644 (file)
--- a/gdk/gdkdrawcontext.h
+++ b/gdk/gdkdrawcontext.h
@@ -21,7 +21,7 @@
 #ifndef __GDK_DRAW_CONTEXT__
 #define __GDK_DRAW_CONTEXT__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkdrop.h b/gdk/gdkdrop.h
index 857d44082fdb17a65e3c8a6021322c89401a6eee..db5acd13e94a9ca23e60ee909d7b1c543e2491a9 100644 (file)
--- a/gdk/gdkdrop.h
+++ b/gdk/gdkdrop.h
@@ -21,7 +21,7 @@
 #ifndef __GDK_DROP_H__
 #define __GDK_DROP_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkenumtypes.h.template b/gdk/gdkenumtypes.h.template
index d6f62480bcd6393a0e4822834950fb14c214c111..e200000cdb2a365469dbf81b173d68a927af5997 100644 (file)
--- a/gdk/gdkenumtypes.h.template
+++ b/gdk/gdkenumtypes.h.template
@@ -2,7 +2,7 @@
 #ifndef __GDK_ENUM_TYPES_H__
 #define __GDK_ENUM_TYPES_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 2ddacb0edec336e9bda09849ccb59e47e4e4ed55..4f90cd8d076ffc6eed4c3dbd212d54b009c8b6b0 100644 (file)
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_EVENTS_H__
 #define __GDK_EVENTS_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkframeclock.h b/gdk/gdkframeclock.h
index d1a91f9c25810521a63638abc849483fcc6d05ac..962bf0c189a4c612545c0ab23c54c61bcee7cf28 100644 (file)
--- a/gdk/gdkframeclock.h
+++ b/gdk/gdkframeclock.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_FRAME_CLOCK_H__
 #define __GDK_FRAME_CLOCK_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkframetimings.h b/gdk/gdkframetimings.h
index cfe6435787faa0a71ceaac8259028c483a566bab..7ed36301b50f9c39eb445a67e8cc9952488c38ef 100644 (file)
--- a/gdk/gdkframetimings.h
+++ b/gdk/gdkframetimings.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_FRAME_TIMINGS_H__
 #define __GDK_FRAME_TIMINGS_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkglcontext.h b/gdk/gdkglcontext.h
index 83585fbe25ae81ae5434074dfb91f5205112e3cc..10bac82e9bfa0ac0373d19d413c80232c968adc4 100644 (file)
--- a/gdk/gdkglcontext.h
+++ b/gdk/gdkglcontext.h
@@ -21,7 +21,7 @@
 #ifndef __GDK_GL_CONTEXT_H__
 #define __GDK_GL_CONTEXT_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkgltexture.h b/gdk/gdkgltexture.h
index 342f21a10b1be41410be00430d45dec33ef8fb8c..54e4fee7e7ed631e4d2d5566094490059cc2abfd 100644 (file)
--- a/gdk/gdkgltexture.h
+++ b/gdk/gdkgltexture.h
@@ -19,7 +19,7 @@
 #ifndef __GDK_GL_TEXTURE_H__
 #define __GDK_GL_TEXTURE_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index d6a0f0cb191b3a63ceaa7db203936e9562c064d6..1c9093e807f4f352f00c6d02198f6adf3d8d69f4 100644 (file)
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_KEYS_H__
 #define __GDK_KEYS_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkmemorytexture.h b/gdk/gdkmemorytexture.h
index 7064455378045547db29159074ee3493e7fd3388..eea2fda32451fc0af7e7b5524609262c32ee9341 100644 (file)
--- a/gdk/gdkmemorytexture.h
+++ b/gdk/gdkmemorytexture.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_MEMORY_TEXTURE__H__
 #define __GDK_MEMORY_TEXTURE__H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkmonitor.h b/gdk/gdkmonitor.h
index b711195e3145198ebdd85df66d38fa2991c5253c..832f7010e904aa5a739cf231697704f4fc274228 100644 (file)
--- a/gdk/gdkmonitor.h
+++ b/gdk/gdkmonitor.h
@@ -22,7 +22,7 @@
 #ifndef __GDK_MONITOR_H__
 #define __GDK_MONITOR_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkpaintable.h b/gdk/gdkpaintable.h
index 7686286c873df73a39689f3cd18fa20c5a86a880..b32918c633044df39a8c074093a5d700f6694e42 100644 (file)
--- a/gdk/gdkpaintable.h
+++ b/gdk/gdkpaintable.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_PAINTABLE_H__
 #define __GDK_PAINTABLE_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index 2f2d0d2a2e71e26275d87964f305471fc1bdb0cd..1378e7892a8797ad60dcaf8f6ba8ee4f563d7349 100644 (file)
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_PANGO_H__
 #define __GDK_PANGO_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h
index 65e49348c274706de1fb9c5f087c0d2df63a3958..c2538c96330abb98388ff474715451f3a50fb40b 100644 (file)
--- a/gdk/gdkpixbuf.h
+++ b/gdk/gdkpixbuf.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_PIXBUF_H__
 #define __GDK_PIXBUF_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h
index c04c7e2e89b7b5a12bb3461e982eb633d111eabe..a54adc27750ba974f16a1d7c800a8590bacb0aee 100644 (file)
--- a/gdk/gdkproperty.h
+++ b/gdk/gdkproperty.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_PROPERTY_H__
 #define __GDK_PROPERTY_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkrectangle.h b/gdk/gdkrectangle.h
index 3b6349c28e4a3c105d1052f99bcba36ed42b1373..0f28fa6f4b7fb8e01e5536788963f9084a7cb386 100644 (file)
--- a/gdk/gdkrectangle.h
+++ b/gdk/gdkrectangle.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_RECTANGLE_H__
 #define __GDK_RECTANGLE_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h
index 7a4e4581f141d78221c62ae9e4c5d24896c90d05..d5f8d80cae5e1085ee8944ca6dd1feac093092f2 100644 (file)
--- a/gdk/gdkrgba.h
+++ b/gdk/gdkrgba.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_RGBA_H__
 #define __GDK_RGBA_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkseat.h b/gdk/gdkseat.h
index 14d7f83a63a22f4a31385f73c6c6b4523a9852a4..e26676e459016e65e232327b90ad58f7aabedea5 100644 (file)
--- a/gdk/gdkseat.h
+++ b/gdk/gdkseat.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_SEAT_H__
 #define __GDK_SEAT_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdksnapshot.h b/gdk/gdksnapshot.h
index 5f282f69fa9ac177a947ac23b1f53bed4bb90ec4..ccee850e9872588027afa67b692ba2dac9c843d3 100644 (file)
--- a/gdk/gdksnapshot.h
+++ b/gdk/gdksnapshot.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_SNAPSHOT_H__
 #define __GDK_SNAPSHOT_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h
index 6b525e89dc521e8494794d3208b6c6a23a93a1f2..c968cae3695be1a0f527686e14d3c94996be4d2c 100644 (file)
--- a/gdk/gdksurface.h
+++ b/gdk/gdksurface.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_SURFACE_H__
 #define __GDK_SURFACE_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdktexture.h b/gdk/gdktexture.h
index be43990a9fdd238c7fc7b2bd8e0ba51b4c2b049a..f7d4fbf56713c906571fa6a88893094a529a3418 100644 (file)
--- a/gdk/gdktexture.h
+++ b/gdk/gdktexture.h
@@ -19,7 +19,7 @@
 #ifndef __GDK_TEXTURE_H__
 #define __GDK_TEXTURE_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 3cd6472d82637af0f390b469b94f9719304c697d..faa842ae85f04d97dcb0fb9f5a4372152ec89ad2 100644 (file)
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_TYPES_H__
 #define __GDK_TYPES_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkversionmacros.h.in b/gdk/gdkversionmacros.h.in
index 75c725ce91ab2b1755c7ebe5783c6dac11191430..981001ae9501087ad1b5dd85bce7f11289b538f9 100644 (file)
--- a/gdk/gdkversionmacros.h.in
+++ b/gdk/gdkversionmacros.h.in
@@ -15,7 +15,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GDK_H_INSIDE__) && !defined (__GTK_CSS_H_INSIDE__) && !defined (GDK_COMPILATION) && !defined (GTK_CSS_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_COMPILATION) && !defined (GTK_CSS_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkvulkancontext.h b/gdk/gdkvulkancontext.h
index 089a32b260c5b3f5ceba91c701e7543c1b3e10cd..7b184b81e93ad0f61b329fe5d52faad7348a3b09 100644 (file)
--- a/gdk/gdkvulkancontext.h
+++ b/gdk/gdkvulkancontext.h
@@ -21,7 +21,7 @@
 #ifndef __GDK_VULKAN_CONTEXT__
 #define __GDK_VULKAN_CONTEXT__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/meson.build b/gdk/meson.build
index 21c38df33eaa927a299a324e010f519dc9a82705..6089e50ea542b95296452b1b51d5fd26b3cd9673 100644 (file)
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -234,7 +234,7 @@ libgdk = static_library('gdk',
   link_with: [libgtk_css, ],
   include_directories: [confinc, gdkx11_inc, wlinc],
   c_args: [
-    '-DGDK_COMPILATION',
+    '-DGTK_COMPILATION',
     '-DG_LOG_DOMAIN="Gdk"',
   ] + common_cflags,
   link_whole: gdk_backends,

diff --git a/gdk/quartz/gdkquartzcursor.h b/gdk/quartz/gdkquartzcursor.h
index 0938eeb065ef8eda48fca7757fd073d4a160d184..d8668b8925622ae648216190ccfac24966fcb1c6 100644 (file)
--- a/gdk/quartz/gdkquartzcursor.h
+++ b/gdk/quartz/gdkquartzcursor.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_CURSOR_H__
 #define __GDK_QUARTZ_CURSOR_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define GDK_IS_QUARTZ_CURSOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_CURSOR))
 #define GDK_QUARTZ_CURSOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_CURSOR, GdkQuartzCursorClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzCursor GdkQuartzCursor;
 #else
 typedef GdkCursor GdkQuartzCursor;

diff --git a/gdk/quartz/gdkquartzdevice-core.h b/gdk/quartz/gdkquartzdevice-core.h
index 9b320f60b7bcf70afd37b97f1e0d4ce3b9a51000..4b88a0b555f84ff8b9fd73c965c2cf2d4ed3d6da 100644 (file)
--- a/gdk/quartz/gdkquartzdevice-core.h
+++ b/gdk/quartz/gdkquartzdevice-core.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_QUARTZ_DEVICE_CORE_H__
 #define __GDK_QUARTZ_DEVICE_CORE_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 

diff --git a/gdk/quartz/gdkquartzdevicemanager-core.h b/gdk/quartz/gdkquartzdevicemanager-core.h
index 8ab4966cc1debd77d6ec9f0ab0a4f60e4beb8fb8..308152ce0e53744934d96770a035d1a051e7f20e 100644 (file)
--- a/gdk/quartz/gdkquartzdevicemanager-core.h
+++ b/gdk/quartz/gdkquartzdevicemanager-core.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
 #define __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 

diff --git a/gdk/quartz/gdkquartzdisplay.h b/gdk/quartz/gdkquartzdisplay.h
index ce709a6b3f5b2778ee064251765ccffe790acea4..23ed898d54233536bd6d6576135c50f574bb1867 100644 (file)
--- a/gdk/quartz/gdkquartzdisplay.h
+++ b/gdk/quartz/gdkquartzdisplay.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_DISPLAY_H__
 #define __GDK_QUARTZ_DISPLAY_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define GDK_IS_QUARTZ_DISPLAY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_DISPLAY))
 #define GDK_QUARTZ_DISPLAY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_DISPLAY, GdkQuartzDisplayClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzDisplay GdkQuartzDisplay;
 #else
 typedef GdkDisplay GdkQuartzDisplay;

diff --git a/gdk/quartz/gdkquartzdisplaymanager.h b/gdk/quartz/gdkquartzdisplaymanager.h
index 38fc822cbba24e51b764a68e482b8395d1c57d36..8aa193830437b52ee8910ae97e7fd1b60260e44c 100644 (file)
--- a/gdk/quartz/gdkquartzdisplaymanager.h
+++ b/gdk/quartz/gdkquartzdisplaymanager.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_DISPLAY_MANAGER_H__
 #define __GDK_QUARTZ_DISPLAY_MANAGER_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define GDK_TYPE_QUARTZ_DISPLAY_MANAGER    (gdk_quartz_display_manager_get_type ())
 #define GDK_QUARTZ_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_QUARTZ_DISPLAY_MANAGER, GdkQuartzDisplayManager))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzDisplayManager GdkQuartzDisplayManager;
 #else
 typedef GdkDisplayManager _GdkQuartzDisplayManager;

diff --git a/gdk/quartz/gdkquartzdnd.h b/gdk/quartz/gdkquartzdnd.h
index d1a618d134c961a1169f67227d72868ca0079dd6..18f3727c59df78add7d91b70d3e3a568ec432d78 100644 (file)
--- a/gdk/quartz/gdkquartzdnd.h
+++ b/gdk/quartz/gdkquartzdnd.h
@@ -19,7 +19,7 @@
 #ifndef __GDK_QUARTZ_DND_H__
 #define __GDK_QUARTZ_DND_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 #define GDK_IS_QUARTZ_DRAG_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_DRAG_CONTEXT))
 #define GDK_QUARTZ_DRAG_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_DRAG_CONTEXT, GdkQuartzDragContextClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzDragContext GdkQuartzDragContext;
 #else
 typedef GdkDragContext GdkQuartzDragContext;

diff --git a/gdk/quartz/gdkquartzkeys.h b/gdk/quartz/gdkquartzkeys.h
index 86fe6580bf505cc6d9b2edcfa91acad3a308f5af..9325b95b015d14ac2cffaefda10245432c589731 100644 (file)
--- a/gdk/quartz/gdkquartzkeys.h
+++ b/gdk/quartz/gdkquartzkeys.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_KEYS_H__
 #define __GDK_QUARTZ_KEYS_H__
 
-#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define GDK_IS_QUARTZ_KEYMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_KEYMAP))
 #define GDK_QUARTZ_KEYMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_KEYMAP, GdkQuartzKeymapClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzKeymap GdkQuartzKeymap;
 #else
 typedef GdkKeymap GdkQuartzKeymap;

diff --git a/gdk/quartz/gdkquartzmonitor.h b/gdk/quartz/gdkquartzmonitor.h
index 92a619e935010f7010183b2864b68243335f7ab5..a1ccda70d2b3a79696702781c202955586e96ab9 100644 (file)
--- a/gdk/quartz/gdkquartzmonitor.h
+++ b/gdk/quartz/gdkquartzmonitor.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_MONITOR_H__
 #define __GDK_QUARTZ_MONITOR_H__
 
-#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 

diff --git a/gdk/quartz/gdkquartzscreen.h b/gdk/quartz/gdkquartzscreen.h
index 245068df25ec8e94bd6b7f3c9115aa5c059c79c7..3281ebc0ab4d0756589da73c9d9de1dd74172c53 100644 (file)
--- a/gdk/quartz/gdkquartzscreen.h
+++ b/gdk/quartz/gdkquartzscreen.h
@@ -19,7 +19,7 @@
 #ifndef __GDK_QUARTZ_SCREEN_H__
 #define __GDK_QUARTZ_SCREEN_H__
 
-#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 

diff --git a/gdk/quartz/gdkquartzsurface.h b/gdk/quartz/gdkquartzsurface.h
index 5bfd8d50621332b054e2eb4344557d5a1357fcf5..6faa326b1c0b53ee94128b9ea5fa33cdc776aba2 100644 (file)
--- a/gdk/quartz/gdkquartzsurface.h
+++ b/gdk/quartz/gdkquartzsurface.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_SURFACE_H__
 #define __GDK_QUARTZ_SURFACE_H__
 
-#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define GDK_IS_QUARTZ_SURFACE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_SURFACE))
 #define GDK_QUARTZ_SURFACE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_SURFACE, GdkQuartzSurfaceClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkQuartzSurface GdkQuartzSurface;
 #else
 typedef GdkSurface GdkQuartzSurface;

diff --git a/gdk/quartz/gdkquartzutils.h b/gdk/quartz/gdkquartzutils.h
index 12feec3b865887963d143160a840328d1850a923..9909aa18b574e286d07cf391190261cfc55a1485 100644 (file)
--- a/gdk/quartz/gdkquartzutils.h
+++ b/gdk/quartz/gdkquartzutils.h
@@ -20,7 +20,7 @@
 #ifndef __GDK_QUARTZ_UTILS_H__
 #define __GDK_QUARTZ_UTILS_H__
 
-#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 

diff --git a/gdk/quartz/meson.build b/gdk/quartz/meson.build
index 0575bb99a629daef72ba4c38e607ea66a0f985f7..37c3ef2cf6542d0e552539bcdc778837227457a9 100644 (file)
--- a/gdk/quartz/meson.build
+++ b/gdk/quartz/meson.build
@@ -41,5 +41,5 @@ gdk_quartz_deps = [ # FIXME
 libgdk_quartz = static_library('gdk-quartz',
   gdk_quartz_sources, gdkconfig, gdkenum_h,
   include_directories: [confinc, gdkinc],
-  c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-xobjective-c'],
+  c_args: ['-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-xobjective-c'],
   dependencies: [gdk_deps, gdk_quartz_deps])

diff --git a/gdk/wayland/gdkwaylanddevice.h b/gdk/wayland/gdkwaylanddevice.h
index 7bb843e1dbc6718f61d601a6182907f7d2f2d733..d0daaeae8c7a1c32324f9148c194717de335aec5 100644 (file)
--- a/gdk/wayland/gdkwaylanddevice.h
+++ b/gdk/wayland/gdkwaylanddevice.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_WAYLAND_DEVICE_H__
 #define __GDK_WAYLAND_DEVICE_H__
 
-#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
@@ -28,7 +28,7 @@
 
 G_BEGIN_DECLS
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkWaylandDevice GdkWaylandDevice;
 #else
 typedef GdkDevice GdkWaylandDevice;

diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h
index 99dfe4777557ad0978c8c93bcc99ffeff4ede947..e07fe84915ac43c2545e0db5b19c9cbde54d81bb 100644 (file)
--- a/gdk/wayland/gdkwaylanddisplay.h
+++ b/gdk/wayland/gdkwaylanddisplay.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_WAYLAND_DISPLAY_H__
 #define __GDK_WAYLAND_DISPLAY_H__
 
-#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
@@ -28,7 +28,7 @@
 
 G_BEGIN_DECLS
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkWaylandDisplay GdkWaylandDisplay;
 #else
 typedef GdkDisplay GdkWaylandDisplay;

diff --git a/gdk/wayland/gdkwaylandglcontext.h b/gdk/wayland/gdkwaylandglcontext.h
index 1e99d01b30feb90a7ae8f43a6ec683f4970ecaa3..34a1e4c2a4f027739b2aabcb93941a37867f24c8 100644 (file)
--- a/gdk/wayland/gdkwaylandglcontext.h
+++ b/gdk/wayland/gdkwaylandglcontext.h
@@ -22,7 +22,7 @@
 #ifndef __GDK_WAYLAND_GL_CONTEXT_H__
 #define __GDK_WAYLAND_GL_CONTEXT_H__
 
-#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 

diff --git a/gdk/wayland/gdkwaylandmonitor.h b/gdk/wayland/gdkwaylandmonitor.h
index 8ad95128b578c0ebc3c9d143432b48e812f29823..f856a1108d825501896d8a2192b24f3191425431 100644 (file)
--- a/gdk/wayland/gdkwaylandmonitor.h
+++ b/gdk/wayland/gdkwaylandmonitor.h
@@ -22,7 +22,7 @@
 #ifndef __GDK_WAYLAND_MONITOR_H__
 #define __GDK_WAYLAND_MONITOR_H__
 
-#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 

diff --git a/gdk/wayland/gdkwaylandsurface.h b/gdk/wayland/gdkwaylandsurface.h
index 1c4f057a741cec79c6fc9119566f622e6e2503d0..b7b73ba8ef066231040768dec5387ea40a10afde 100644 (file)
--- a/gdk/wayland/gdkwaylandsurface.h
+++ b/gdk/wayland/gdkwaylandsurface.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_WAYLAND_SURFACE_H__
 #define __GDK_WAYLAND_SURFACE_H__
 
-#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
@@ -28,7 +28,7 @@
 
 G_BEGIN_DECLS
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkWaylandSurface GdkWaylandSurface;
 #else
 typedef GdkSurface GdkWaylandSurface;

diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
index f40fe3b415434dc8161fc47a11895e3bb46a33db..fe094bb7e47788a29bbf03b11d31c09ac3a27a58 100644 (file)
--- a/gdk/wayland/meson.build
+++ b/gdk/wayland/meson.build
@@ -101,7 +101,7 @@ libgdk_wayland = static_library('gdk-wayland',
                                 gdk_wayland_sources, gdk_wayland_gen_headers, gdkconfig, gdkenum_h,
                                 include_directories: [ confinc, gdkinc, ],
                                 c_args: [
-                                  '-DGDK_COMPILATION',
+                                  '-DGTK_COMPILATION',
                                   '-DG_LOG_DOMAIN="Gdk"',
                                 ] + common_cflags,
                                 link_args: common_ldflags,

diff --git a/gdk/win32/gdkwin32cursor.h b/gdk/win32/gdkwin32cursor.h
index 60d8a6ad5deaf2a14a672ec609c79da003e8af59..ec03f7721253a57aac58892488a0d4ff423ad83b 100644 (file)
--- a/gdk/win32/gdkwin32cursor.h
+++ b/gdk/win32/gdkwin32cursor.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_WIN32_CURSOR_H__
 #define __GDK_WIN32_CURSOR_H__
 
-#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
 #endif
 
@@ -56,7 +56,7 @@ struct _GdkWin32HCursorFake
 
 #define gdk_win32_hcursor_get_handle_fast(x) (((struct _GdkWin32HCursorFake *) x)->readonly_handle)
 
-#if defined (GDK_COMPILATION)
+#if defined (GTK_COMPILATION)
 #define          gdk_win32_hcursor_get_handle gdk_win32_hcursor_get_handle_fast
 #else
 GDK_AVAILABLE_IN_ALL

diff --git a/gdk/win32/gdkwin32display.h b/gdk/win32/gdkwin32display.h
index 75acc4f86bf4200ee87f958965066f4a2a7948aa..7671fd88a2dc55d196a43e2652aab56505a190a8 100644 (file)
--- a/gdk/win32/gdkwin32display.h
+++ b/gdk/win32/gdkwin32display.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_WIN32_DISPLAY_H__
 #define __GDK_WIN32_DISPLAY_H__
 
-#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@
 
 G_BEGIN_DECLS
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkWin32Display GdkWin32Display;
 #else
 typedef GdkDisplay GdkWin32Display;

diff --git a/gdk/win32/gdkwin32displaymanager.h b/gdk/win32/gdkwin32displaymanager.h
index b4d9e71923e2720b7f861ebaf8f34749bb8265c8..ce7e9ffb1c86ac3075ec14ca9d10391889b7a10e 100644 (file)
--- a/gdk/win32/gdkwin32displaymanager.h
+++ b/gdk/win32/gdkwin32displaymanager.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_WIN32_DISPLAY_MANAGER_H__
 #define __GDK_WIN32_DISPLAY_MANAGER_H__
 
-#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
 #endif
 
@@ -26,7 +26,7 @@
 
 G_BEGIN_DECLS
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkWin32DisplayManager GdkWin32DisplayManager;
 #else
 typedef GdkDisplayManager GdkWin32DisplayManager;

diff --git a/gdk/win32/gdkwin32dnd-private.h b/gdk/win32/gdkwin32dnd-private.h
index efe081f77e28c2d0a990fb1b3c90e3ac2070eaa1..7fe93244665f890b1f31011d969ee550eb56466f 100644 (file)
--- a/gdk/win32/gdkwin32dnd-private.h
+++ b/gdk/win32/gdkwin32dnd-private.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_WIN32_DND_PRIVATE_H__
 #define __GDK_WIN32_DND_PRIVATE_H__
 
-#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
 #endif
 

diff --git a/gdk/win32/gdkwin32dnd.h b/gdk/win32/gdkwin32dnd.h
index af6cc402dd0378ee6987314f746e56b27f89b37d..a40aea7d96f84487e18fd9ac08aadb0f588c9c0c 100644 (file)
--- a/gdk/win32/gdkwin32dnd.h
+++ b/gdk/win32/gdkwin32dnd.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_WIN32_DND_H__
 #define __GDK_WIN32_DND_H__
 
-#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
 #endif
 
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 #define GDK_IS_WIN32_DRAG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WIN32_DRAG))
 #define GDK_WIN32_DRAG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WIN32_DRAG, GdkWin32DragClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkWin32Drag GdkWin32Drag;
 #else
 typedef GdkDrag GdkWin32Drag;

diff --git a/gdk/win32/gdkwin32glcontext.h b/gdk/win32/gdkwin32glcontext.h
index e87192d700e9b2a9c32bd39266fee5cee947fa70..6b55735a9d8b9c0e38c3fde7b93d1b47a579deab 100644 (file)
--- a/gdk/win32/gdkwin32glcontext.h
+++ b/gdk/win32/gdkwin32glcontext.h
@@ -21,7 +21,7 @@
 #ifndef __GDK_WIN32_GL_CONTEXT_H__
 #define __GDK_WIN32_GL_CONTEXT_H__
 
-#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
 #endif
 

diff --git a/gdk/win32/gdkwin32keys.h b/gdk/win32/gdkwin32keys.h
index bc7add5bfc5c44de817fc51e2d5ed9e17d96e12d..5dcef11fa17d65ff29b1e31e303179e7d1616a5f 100644 (file)
--- a/gdk/win32/gdkwin32keys.h
+++ b/gdk/win32/gdkwin32keys.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_WIN32_KEYS_H__
 #define __GDK_WIN32_KEYS_H__
 
-#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
 #endif
 
@@ -44,7 +44,7 @@ typedef enum
   GDK_WIN32_KEYMAP_MATCH_EXACT
 } GdkWin32KeymapMatch;
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkWin32Keymap GdkWin32Keymap;
 #else
 typedef GdkKeymap GdkWin32Keymap;

diff --git a/gdk/win32/gdkwin32misc.h b/gdk/win32/gdkwin32misc.h
index 5410c8edda8e3932b629e99117a496b568a28ae1..dcd9471dc9e9b32bd651e4e10809f1c722c5a1fb 100644 (file)
--- a/gdk/win32/gdkwin32misc.h
+++ b/gdk/win32/gdkwin32misc.h
@@ -26,7 +26,7 @@
 #ifndef __GDK_WIN32_MISC_H__
 #define __GDK_WIN32_MISC_H__
 
-#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
 #endif
 
@@ -85,7 +85,7 @@ GDK_AVAILABLE_IN_ALL
 GdkSurface *   gdk_win32_surface_lookup_for_display (GdkDisplay *display,
                                                      HWND        anid);
 
-#if defined (INSIDE_GDK_WIN32) || defined (GDK_COMPILATION) || defined (GTK_COMPILATION)
+#if defined (INSIDE_GDK_WIN32) || defined (GTK_COMPILATION) || defined (GTK_COMPILATION)
 
 /* For internal GTK use only */
 GDK_AVAILABLE_IN_ALL

diff --git a/gdk/win32/gdkwin32monitor.h b/gdk/win32/gdkwin32monitor.h
index 7814bf31f424053bd573e061cbe96e210529be71..873ab8026e38be4ca5524dcfadc1a32ea274af34 100644 (file)
--- a/gdk/win32/gdkwin32monitor.h
+++ b/gdk/win32/gdkwin32monitor.h
@@ -23,7 +23,7 @@
 #ifndef __GDK_WIN32_MONITOR_H__
 #define __GDK_WIN32_MONITOR_H__
 
-#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
 #endif
 
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define GDK_WIN32_MONITOR(object)        (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WIN32_MONITOR, GdkWin32Monitor))
 #define GDK_IS_WIN32_MONITOR(object)     (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WIN32_MONITOR))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkWin32Monitor      GdkWin32Monitor;
 #else
 typedef GdkMonitor GdkWin32Monitor;

diff --git a/gdk/win32/gdkwin32screen.h b/gdk/win32/gdkwin32screen.h
index eb12e2ad9b8234e7f4daedd21f78f694dbf8049a..fa2b8daff8d7f058fb2a8609becefad175093531 100644 (file)
--- a/gdk/win32/gdkwin32screen.h
+++ b/gdk/win32/gdkwin32screen.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_WIN32_SCREEN_H__
 #define __GDK_WIN32_SCREEN_H__
 
-#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
 #endif
 

diff --git a/gdk/win32/gdkwin32surface.h b/gdk/win32/gdkwin32surface.h
index f081a49aadb85b2840304230ee3f79caf937840e..655abd0113722f5368ec74808a1d1b7c94cb5e63 100644 (file)
--- a/gdk/win32/gdkwin32surface.h
+++ b/gdk/win32/gdkwin32surface.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_WIN32_SURFACE_H__
 #define __GDK_WIN32_SURFACE_H__
 
-#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/gdkwin32.h> can be included directly."
 #endif
 
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 #define GDK_IS_WIN32_SURFACE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WIN32_SURFACE))
 #define GDK_WIN32_SURFACE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WIN32_SURFACE, GdkWin32SurfaceClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkWin32Surface GdkWin32Surface;
 #else
 typedef GdkSurface GdkWin32Surface;

diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build
index 9567c96609cfae939e68efc7d8c4a31f9aa221ff..2a1cbe403bcf1f153eee7d26fd4906e97b3ef17e 100644 (file)
--- a/gdk/win32/meson.build
+++ b/gdk/win32/meson.build
@@ -50,5 +50,5 @@ gdk_win32_deps = [ # FIXME
 libgdk_win32 = static_library('gdk-win32',
   gdk_win32_sources, gdkconfig, gdkenum_h,
   include_directories: [confinc, gdkinc],
-  c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-DINSIDE_GDK_WIN32'],
+  c_args: ['-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-DINSIDE_GDK_WIN32'],
   dependencies: [gdk_deps, gdk_win32_deps])

diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h
index e2353f85eef3ea82f91462c451421c1abfb337f0..123f77e8114eb56c16e9ec49bb463779d15f51c6 100644 (file)
--- a/gdk/x11/gdkx-autocleanups.h
+++ b/gdk/x11/gdkx-autocleanups.h
@@ -15,7 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 

diff --git a/gdk/x11/gdkx11applaunchcontext.h b/gdk/x11/gdkx11applaunchcontext.h
index 93a2f8c1da9252ec0fd3ba55952bc89f5ed7fffc..a1ef85af543da3428036ac9c51ec167940429af5 100644 (file)
--- a/gdk/x11/gdkx11applaunchcontext.h
+++ b/gdk/x11/gdkx11applaunchcontext.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_X11_APP_LAUNCH_CONTEXT_H__
 #define __GDK_X11_APP_LAUNCH_CONTEXT_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 #define GDK_IS_X11_APP_LAUNCH_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_APP_LAUNCH_CONTEXT))
 #define GDK_X11_APP_LAUNCH_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_APP_LAUNCH_CONTEXT, GdkX11AppLaunchContextClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkX11AppLaunchContext GdkX11AppLaunchContext;
 #else
 typedef GdkAppLaunchContext GdkX11AppLaunchContext;

diff --git a/gdk/x11/gdkx11device.h b/gdk/x11/gdkx11device.h
index cab49734dfeda653921f0253aa08cc854d297f4d..ae9e606303f9e5afc8522ef262ba230ec1d00013 100644 (file)
--- a/gdk/x11/gdkx11device.h
+++ b/gdk/x11/gdkx11device.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_X11_DEVICE_H__
 #define __GDK_X11_DEVICE_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 

diff --git a/gdk/x11/gdkx11devicemanager.h b/gdk/x11/gdkx11devicemanager.h
index f3b081546203d64b196db6930f48c19812f196e9..f1c9ac62c9d735f383f3a854d4647d4fe617f242 100644 (file)
--- a/gdk/x11/gdkx11devicemanager.h
+++ b/gdk/x11/gdkx11devicemanager.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_X11_DEVICE_MANAGER_H__
 #define __GDK_X11_DEVICE_MANAGER_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 

diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index b885357f7007bc9fbf130ab623d9001adc7fecc5..c4801b2e335db991a1322f88c2edb7e93bfe5c77 100644 (file)
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_X11_DISPLAY_H__
 #define __GDK_X11_DISPLAY_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
@@ -37,7 +37,7 @@
 
 G_BEGIN_DECLS
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkX11Display GdkX11Display;
 #else
 typedef GdkDisplay GdkX11Display;

diff --git a/gdk/x11/gdkx11dnd.h b/gdk/x11/gdkx11dnd.h
index 531898337546017420a5a178337176b3729788bc..4da3d31652d24ee2c6ba04e0b26126d235619140 100644 (file)
--- a/gdk/x11/gdkx11dnd.h
+++ b/gdk/x11/gdkx11dnd.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_X11_DND_H__
 #define __GDK_X11_DND_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 #define GDK_IS_X11_DRAG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_DRAG))
 #define GDK_X11_DRAG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_DRAG, GdkX11DragClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkX11Drag GdkX11Drag;
 #else
 typedef GdkDrag GdkX11Drag;

diff --git a/gdk/x11/gdkx11glcontext.h b/gdk/x11/gdkx11glcontext.h
index 29235dcb02e36561db7f9887e30d9b30ae149beb..4053ac4b4fdaa3d93879388e8d18ea56e4ca7f1a 100644 (file)
--- a/gdk/x11/gdkx11glcontext.h
+++ b/gdk/x11/gdkx11glcontext.h
@@ -21,7 +21,7 @@
 #ifndef __GDK_X11_GL_CONTEXT_H__
 #define __GDK_X11_GL_CONTEXT_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 

diff --git a/gdk/x11/gdkx11keys.h b/gdk/x11/gdkx11keys.h
index e4575d59275cc0147c0d4844caed98358d49d4f6..b33d4cddf045f0c50f8418b8a6e48de7a18b6b3b 100644 (file)
--- a/gdk/x11/gdkx11keys.h
+++ b/gdk/x11/gdkx11keys.h
@@ -18,7 +18,7 @@
 #ifndef __GDK_X11_KEYS_H__
 #define __GDK_X11_KEYS_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
@@ -26,7 +26,7 @@
 
 G_BEGIN_DECLS
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkX11Keymap GdkX11Keymap;
 #else
 typedef GdkKeymap GdkX11Keymap;

diff --git a/gdk/x11/gdkx11monitor.h b/gdk/x11/gdkx11monitor.h
index 8f7dd86177682b1f1c5293ff1b018a94221104e8..cd0a8d956584d7b0961b4d18b1d04c61f01dd33b 100644 (file)
--- a/gdk/x11/gdkx11monitor.h
+++ b/gdk/x11/gdkx11monitor.h
@@ -22,7 +22,7 @@
 #ifndef __GDK_X11_MONITOR_H__
 #define __GDK_X11_MONITOR_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 

diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h
index 8fac2b11bed5672ff1489ebc0a96dc6ac93b3d74..7bdc1372165b7b0680664ebb254c7036164612c9 100644 (file)
--- a/gdk/x11/gdkx11property.h
+++ b/gdk/x11/gdkx11property.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_X11_PROPERTY_H__
 #define __GDK_X11_PROPERTY_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 

diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h
index bb82c869797325e8bfd4de10b263edf843fdaa58..61b965d992a54e5cd3dcc648d73e5ba6757686a8 100644 (file)
--- a/gdk/x11/gdkx11screen.h
+++ b/gdk/x11/gdkx11screen.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_X11_SCREEN_H__
 #define __GDK_X11_SCREEN_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 

diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h
index 1a91f115959e544a119806580452415238d60f0e..2c7d8e2d9b2c8bcbbb51da502c47fb786bcde329 100644 (file)
--- a/gdk/x11/gdkx11selection.h
+++ b/gdk/x11/gdkx11selection.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_X11_SELECTION_H__
 #define __GDK_X11_SELECTION_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 

diff --git a/gdk/x11/gdkx11surface.h b/gdk/x11/gdkx11surface.h
index fdd7d8eb95203ebb3045a04b2120814cd38f9469..f2be036d38782380a3260056b26f60306f02acf0 100644 (file)
--- a/gdk/x11/gdkx11surface.h
+++ b/gdk/x11/gdkx11surface.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_X11_SURFACE_H__
 #define __GDK_X11_SURFACE_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
@@ -43,7 +43,7 @@ G_BEGIN_DECLS
 #define GDK_IS_X11_SURFACE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_SURFACE))
 #define GDK_X11_SURFACE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_SURFACE, GdkX11SurfaceClass))
 
-#ifdef GDK_COMPILATION
+#ifdef GTK_COMPILATION
 typedef struct _GdkX11Surface GdkX11Surface;
 #else
 typedef GdkSurface GdkX11Surface;

diff --git a/gdk/x11/gdkx11utils.h b/gdk/x11/gdkx11utils.h
index 7ed8ca833ef4167c2f1718139198fde7a2c93d27..c210766ed5e5f49aad91c551f041b4a39c972c15 100644 (file)
--- a/gdk/x11/gdkx11utils.h
+++ b/gdk/x11/gdkx11utils.h
@@ -25,7 +25,7 @@
 #ifndef __GDK_X11_UTILS_H__
 #define __GDK_X11_UTILS_H__
 
-#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 

diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
index fce1a920790dc94fc17d9a47054f702f8d14e764..bfc624397896bdf10870390ce21c95687c421a2d 100644 (file)
--- a/gdk/x11/meson.build
+++ b/gdk/x11/meson.build
@@ -69,7 +69,7 @@ libgdk_x11 = static_library('gdk-x11', gdkmarshal_h,
                             gdk_x11_sources, gdkconfig, gdkenum_h,
                             include_directories: [ confinc, gdkinc, ],
                             c_args: [
-                              '-DGDK_COMPILATION',
+                              '-DGTK_COMPILATION',
                               '-DG_LOG_DOMAIN="Gdk"',
                             ] + common_cflags,
                             link_args: common_ldflags,

diff --git a/gsk/gsk-autocleanup.h b/gsk/gsk-autocleanup.h
index 8d8b390b5caf93ae6414f67724e86c9d6b6a475a..3c52a43b29051e551216a07e5b9b5b8cf1643b61 100644 (file)
--- a/gsk/gsk-autocleanup.h
+++ b/gsk/gsk-autocleanup.h
@@ -16,7 +16,7 @@
  */
 
 
-#if !defined (__GSK_H_INSIDE__) && !defined (GSK_COMPILATION)
+#if !defined (__GSK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gsk/gsk.h> can be included directly."
 #endif
 

diff --git a/gsk/gskenums.h b/gsk/gskenums.h
index aaaa3b4cb9147d94dfee8bd0b200b6ca1323ca17..2e24a81abd0218caee3a9137b941ab1619998e51 100644 (file)
--- a/gsk/gskenums.h
+++ b/gsk/gskenums.h
@@ -18,7 +18,7 @@
 #ifndef __GSK_ENUMS_H__
 #define __GSK_ENUMS_H__
 
-#if !defined (__GSK_H_INSIDE__) && !defined (GSK_COMPILATION)
+#if !defined (__GSK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gsk/gsk.h> can be included directly."
 #endif
 

diff --git a/gsk/gskrenderer.h b/gsk/gskrenderer.h
index 6dc3ce1f3032d8ccda88fdbb5fb0385a83c254b0..70f05a71804b461ab3035a3c53fb45c9e1ee29fb 100644 (file)
--- a/gsk/gskrenderer.h
+++ b/gsk/gskrenderer.h
@@ -19,7 +19,7 @@
 #ifndef __GSK_RENDERER_H__
 #define __GSK_RENDERER_H__
 
-#if !defined (__GSK_H_INSIDE__) && !defined (GSK_COMPILATION)
+#if !defined (__GSK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gsk/gsk.h> can be included directly."
 #endif
 

diff --git a/gsk/gskrendernode.h b/gsk/gskrendernode.h
index 876905ebc22ec682e0563e38dc385173db10965b..0c4e73706e9abe7ed955804ea02d41869134c98e 100644 (file)
--- a/gsk/gskrendernode.h
+++ b/gsk/gskrendernode.h
@@ -19,7 +19,7 @@
 #ifndef __GSK_RENDER_NODE_H__
 #define __GSK_RENDER_NODE_H__
 
-#if !defined (__GSK_H_INSIDE__) && !defined (GSK_COMPILATION)
+#if !defined (__GSK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gsk/gsk.h> can be included directly."
 #endif
 

diff --git a/gsk/gskroundedrect.h b/gsk/gskroundedrect.h
index 2cc58cd6b4f201da3b88b3a10e6a38de176b64d0..d942df516942235624115041ae3694dc4bc18a47 100644 (file)
--- a/gsk/gskroundedrect.h
+++ b/gsk/gskroundedrect.h
@@ -19,7 +19,7 @@
 #ifndef __GSK_ROUNDED_RECT_H__
 #define __GSK_ROUNDED_RECT_H__
 
-#if !defined (__GSK_H_INSIDE__) && !defined (GSK_COMPILATION)
+#if !defined (__GSK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gsk/gsk.h> can be included directly."
 #endif
 

diff --git a/gsk/gsktransform.h b/gsk/gsktransform.h
index 13f712e0dd0eb43d9235ee654295d36e445679c7..56cafcc4306be87001e6f21fe5b691610f538df6 100644 (file)
--- a/gsk/gsktransform.h
+++ b/gsk/gsktransform.h
@@ -21,7 +21,7 @@
 #ifndef __GSK_TRANSFORM_H__
 #define __GSK_TRANSFORM_H__
 
-#if !defined (__GSK_H_INSIDE__) && !defined (GSK_COMPILATION)
+#if !defined (__GSK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gsk/gsk.h> can be included directly."
 #endif
 

diff --git a/gsk/gsktypes.h b/gsk/gsktypes.h
index 2afe720c9379c18652336a409072a6a2af342666..f514a53364b58bf9da48d17edb8d3bd4ef8a1192 100644 (file)
--- a/gsk/gsktypes.h
+++ b/gsk/gsktypes.h
@@ -18,7 +18,7 @@
 #ifndef __GSK_TYPES_H__
 #define __GSK_TYPES_H__
 
-#if !defined (__GSK_H_INSIDE__) && !defined (GSK_COMPILATION)
+#if !defined (__GSK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gsk/gsk.h> can be included directly."
 #endif
 

diff --git a/gsk/meson.build b/gsk/meson.build
index ed621284bb49b3954a0fe6e8e7d54c75314867f2..c897cabdf6eb0faaa8c79df2a8d0354ec8e5c03f 100644 (file)
--- a/gsk/meson.build
+++ b/gsk/meson.build
@@ -171,7 +171,7 @@ libgsk = static_library('gsk',
                         dependencies: gsk_deps,
                         include_directories: [ confinc, ],
                         c_args: [
-                          '-DGSK_COMPILATION',
+                          '-DGTK_COMPILATION',
                           '-DG_LOG_DOMAIN="Gsk"',
                           '-DG_LOG_STRUCTURED=1',
                         ] + common_cflags,

diff --git a/gtk/a11y/gtkentryaccessible.c b/gtk/a11y/gtkentryaccessible.c
index cd802d256007d6df7cbcb23c1f948a0430e6b05a..3a229bb94dd9556bc7243ebc51834411fc6433cb 100644 (file)
--- a/gtk/a11y/gtkentryaccessible.c
+++ b/gtk/a11y/gtkentryaccessible.c
@@ -17,7 +17,6 @@
 
 #include "config.h"
 
-#define GDK_COMPILATION
 #include "gdk/gdkeventsprivate.h"
 
 #include <glib/gi18n-lib.h>

diff --git a/gtk/a11y/gtktextaccessible.c b/gtk/a11y/gtktextaccessible.c
index 4792f22900af4b694ee8ba40293d6dfbe5c5d4a5..4d086b83c77d841003516d57700453fc15b7d31f 100644 (file)
--- a/gtk/a11y/gtktextaccessible.c
+++ b/gtk/a11y/gtktextaccessible.c
@@ -17,7 +17,6 @@
 
 #include "config.h"
 
-#define GDK_COMPILATION
 #include "gdk/gdkeventsprivate.h"
 
 #include <glib/gi18n-lib.h>

diff --git a/gtk/css/gtkcssenums.h b/gtk/css/gtkcssenums.h
index 8674696b3a9ba2fb913152136abd24f96f87a0aa..a585ab2ae3ceaea7de646d34bd1c977baf9c43f4 100644 (file)
--- a/gtk/css/gtkcssenums.h
+++ b/gtk/css/gtkcssenums.h
@@ -25,7 +25,7 @@
 #ifndef __GTK_CSS_ENUMS_H__
 #define __GTK_CSS_ENUMS_H__
 
-#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_CSS_COMPILATION)
+#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/css/gtkcss.h> can be included directly."
 #endif
 

diff --git a/gtk/css/gtkcssenumtypes.h.template b/gtk/css/gtkcssenumtypes.h.template
index f45dc261e7363df5a064f80f983d8a5f1d011bc6..53471b92c05e309bf8314b0444beca5a6e809bbb 100644 (file)
--- a/gtk/css/gtkcssenumtypes.h.template
+++ b/gtk/css/gtkcssenumtypes.h.template
@@ -2,7 +2,7 @@
 #ifndef __GTK_CSS_ENUM_TYPES_H__
 #define __GTK_CSS_ENUM_TYPES_H__
 
-#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_CSS_COMPILATION)
+#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/css/gtkcss.h> can be included directly."
 #endif
 

diff --git a/gtk/css/gtkcsslocation.h b/gtk/css/gtkcsslocation.h
index f1ea3db50fc429ded67ee223136d035295966588..7fc4559fa0edea467a0bb60af31f132c73578615 100644 (file)
--- a/gtk/css/gtkcsslocation.h
+++ b/gtk/css/gtkcsslocation.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_CSS_LOCATION_H__
 #define __GTK_CSS_LOCATION_H__
 
-#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_CSS_COMPILATION)
+#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/css/gtkcss.h> can be included directly."
 #endif
 

diff --git a/gtk/css/gtkcsssection.h b/gtk/css/gtkcsssection.h
index 43673761528c5fbcbedddadbdbc25379510df2b3..0a5d0f143d6e724bbd0665cf3c46dd4731b989d7 100644 (file)
--- a/gtk/css/gtkcsssection.h
+++ b/gtk/css/gtkcsssection.h
@@ -18,7 +18,7 @@
 #ifndef __GTK_CSS_SECTION_H__
 #define __GTK_CSS_SECTION_H__
 
-#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_CSS_COMPILATION)
+#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/css/gtkcss.h> can be included directly."
 #endif
 

diff --git a/gtk/css/meson.build b/gtk/css/meson.build
index 907b174f496ae858bec0301c51689885b017d807..00284baf3661928bd889d7b652b1d739745952a9 100644 (file)
--- a/gtk/css/meson.build
+++ b/gtk/css/meson.build
@@ -44,7 +44,7 @@ libgtk_css = static_library('gtk_css',
                             dependencies: gtk_css_deps,
                             include_directories: [ confinc, ],
                             c_args: [
-                              '-DGTK_CSS_COMPILATION',
+                              '-DGTK_COMPILATION',
                               '-DG_LOG_DOMAIN="Gtk"',
                               '-DG_LOG_STRUCTURED=1',
                             ] + common_cflags,

diff --git a/gtk/meson.build b/gtk/meson.build
index 4d492dd995eaa3e335c7566b53087ca8ce76aa3f..ffd567302a5b197bac96c0d4776853d001a1f898 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1021,6 +1021,7 @@ gtk_dep_sources = [gtkversion, gtktypebuiltins_h]
 build_gir = get_option('introspection')
 if build_gir
   gir_args = [
+    '-DGTK_COMPILATION',
     '--quiet',
   ]
 
@@ -1051,9 +1052,8 @@ if build_gir
                                includes: gdk_gir_inc,
                                header: 'gdk/gdk.h',
                                install: true,
-                               extra_args: gir_args + [
-                                 '-DGDK_COMPILATION',
-                               ])
+                               extra_args: gir_args,
+  )
   gdk_gir_dep = declare_dependency(sources: gdk_gir)
   gtk_dep_sources += gdk_gir
 
@@ -1069,9 +1069,8 @@ if build_gir
                                      install: true,
                                      dependencies: gdk_gir_dep,
                                      header: 'gdk/gdkx.h',
-                                     extra_args: gir_args + [
-                                       '-DGDK_COMPILATION',
-                                     ])
+                                     extra_args: gir_args,
+    )
     gtk_dep_sources += gdk_x11_gir
   endif
 
@@ -1093,9 +1092,8 @@ if build_gir
                                header: 'gsk/gsk.h',
                                install: true,
                                dependencies: [gdk_gir_dep, graphene_dep],
-                               extra_args: gir_args + [
-                                 '-DGSK_COMPILATION',
-                               ])
+                               extra_args: gir_args,
+  )
   gsk_gir_dep = declare_dependency(dependencies: [gdk_gir_dep, graphene_dep],
                                    sources: gsk_gir)
   gtk_dep_sources += gsk_gir

diff --git a/testsuite/gtk/gestures.c b/testsuite/gtk/gestures.c
index ba7327ccf792996e1d9cd6c2b402ed0b25259729..8fcf6eb5605c2becae07674c596da8f1d3d91568 100644 (file)
--- a/testsuite/gtk/gestures.c
+++ b/testsuite/gtk/gestures.c
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-#define GDK_COMPILATION
+#define GTK_COMPILATION
 #include "gdk/gdkeventsprivate.h"
 
 typedef struct {